From cdce79a3168d08c94d81275d31e26d01271cc796 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 16 Mar 2024 12:17:01 +0000 Subject: [PATCH] remove armf from architecture list for unwind dependency (it was removed before, but inadvertently came back) --- debian/changelog | 2 +- debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 260dde33cf..3daee8a867 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,7 @@ llvm-toolchain-16 (1:16.0.6-20+rpi1) trixie-staging; urgency=medium * Disable scudo on armhf, it needs atomics which we do not want to enable. [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green at Tue, 23 Nov 2021 22:37:30 +0000] - * Remove armhf from architecture list for libunwind-13-dev dependency. + * Remove armhf from architecture list for libunwind-16-dev dependency. -- Raspbian forward porter Fri, 08 Mar 2024 10:44:35 +0000 diff --git a/debian/control b/debian/control index 2ddf086d64..5c89d5692e 100644 --- a/debian/control +++ b/debian/control @@ -689,7 +689,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends}, - libunwind-16-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] + libunwind-16-dev [amd64 arm64 i386 loong64 ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev diff --git a/debian/control.in b/debian/control.in index b8cd75db98..4db26f855b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -689,7 +689,7 @@ Section: libdevel Architecture: any Multi-Arch: same Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, - libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] + libunwind-@LLVM_VERSION@-dev [amd64 arm64 i386 loong64 ppc64el ppc64 riscv64] Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -- 2.30.2